Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds ability to specify git_data_dirs #110

Merged
merged 1 commit into from
May 22, 2017
Merged

Adds ability to specify git_data_dirs #110

merged 1 commit into from
May 22, 2017

Conversation

logicminds
Copy link
Contributor

  • previously if you wanted to specify a data directory you would use
    git_data_dir. However this setting was deprecated in 8.10 in favor
    of git_data_dirs which is a hash of multiple directories.

  • This adds git_data_dirs to the gitlab.rb template and populates
    the hash with the legacy git_data_dir if used, as well as also
    adding the legacy setting.

@logicminds
Copy link
Contributor Author

Please note this change may not work on gitlab before 8.10 as I am not sure how omnibus processes old settings or settings that don't exist yet.

The expected output will be the following when only using git_data_dir

## THIS CONFIGURATION IS MANAGED BY PUPPET
## For setting up different data storing directory
## see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/629def0a7a26e7c2326566f0758d4a27857b52a3/README.md#storing-git-data-in-an-alternative-directory
## If you want to use a single non-default directory to store git data use:
git_data_dir "/var/opt/data"

### For setting up different data storing directory
###! Docs: https://docs.gitlab.com/omnibus/settings/configuration.html#storing-git-data-in-an-alternative-directory
###! **If you want to use a single non-default directory to store git data use a
###!   path that doesn't contain symlinks.**
git_data_dirs({"default"=>"/var/opt/data"})

If only using git_data_dirs than the output looks like:

## THIS CONFIGURATION IS MANAGED BY PUPPET
## For setting up different data storing directory
## see https://gitlab.com/gitlab-org/omnibus-
### For setting up different data storing directory
###! Docs: https://docs.gitlab.com/omnibus/settings/configuration.html#storing-git-data-in-an-alternative-directory
###! **If you want to use a single non-default directory to store git data use a
###!   path that doesn't contain symlinks.**
git_data_dirs({"default"=>"/var/opt/data"})

@logicminds
Copy link
Contributor Author

Docs about this config are here: https://docs.gitlab.com/omnibus/settings/configuration.html#storing-git-data-in-an-alternative-directory

@logicminds
Adds ability to specify git_data_dirs
fbda908 
  * previously if you wanted to specify a data directory you would use
    git_data_dir.  However this setting was deprecated in 8.10 in favor
    of git_data_dirs which is a hash of multiple directories.

  * This adds git_data_dirs to the gitlab.rb template and populates
    the hash with the legacy git_data_dir if used, as well as also
    adding the legacy setting.
@tobru
Copy link
Contributor

tobru commented Mar 15, 2017

Thanks a lot for your contribution. I'd happy to merge it but unfortunately the test fails. Would you mind to fix either the test or your code before I do the merge?

@tobru tobru mentioned this pull request Mar 15, 2017
Closed
@tobru
Copy link
Contributor

tobru commented Apr 8, 2017

@logicminds I'd be happy to merge your PR, would you mind to rebase and check if there are no failing tests? I'll then merge your PR.

@davidgubler davidgubler merged commit fbda908 into voxpupuli:master May 22, 2017
@davidgubler
Copy link
Contributor

I had to fix some things (a9bb637), but I think it looks good now.

@logicminds logicminds deleted the data_dirs branch January 23, 2018 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
needs-rebase
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@logicminds @tobru @davidgubler